take into account both scroll arrows when calculating size request in

2007-01-05  Carlos Garnacho  <carlosg@gnome.org>

        * gtk/gtknotebook.c (gtk_notebook_size_request): take into account
        both scroll arrows when calculating size request in GTK_POS_LEFT or
        GTK_POS_RIGHT notebooks. (#393124, reported by Christian Persch)

svn path=/trunk/; revision=17080

diff --git a/ChangeLog b/ChangeLog
index 28d363d9ebb11e71d39798f4a96c386c9f5c5ee8..7dfb7327b260a391fac5855b3f65c489dcc627e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-05  Carlos Garnacho  <carlosg@gnome.org>
+
+       * gtk/gtknotebook.c (gtk_notebook_size_request): take into account
+       both scroll arrows when calculating size request in GTK_POS_LEFT or
+       GTK_POS_RIGHT notebooks. (#393124, reported by Christian Persch)
+
 2007-01-05  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkwindow.c (gtk_window_key_release_event): chain up to

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index c5f0e41859f6b6a3c45afe54e4e83cd86e30bc34..c8edb873df3f560340dc372096610fc6d7205d5a 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -1865,7 +1865,7 @@ gtk_notebook_size_request (GtkWidget      *widget,
 
                  if (notebook->scrollable && vis_pages > 1 && 
                      widget->requisition.height < tab_height)
-                   tab_height = tab_max + scroll_arrow_vlength + arrow_spacing;
+                   tab_height = tab_max + (2 * scroll_arrow_vlength + arrow_spacing);
 
                  widget->requisition.width += tab_width;